Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ruby-grpc: Only apply the GCC 14 patch if it’s not upstream #368732

Merged
merged 1 commit into from
Jan 15, 2025
Merged

ruby-grpc: Only apply the GCC 14 patch if it’s not upstream #368732

merged 1 commit into from
Jan 15, 2025

Conversation

andersk
Copy link
Contributor

@andersk andersk commented Dec 28, 2024 •
edited
Loading

It was upstreamed in v1.65.0-pre1~90; attempting to apply it again after that causes errors.

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@andersk andersk mentioned this pull request Dec 28, 2024
Merged
13 tasks
paparodeo
paparodeo approved these changes Dec 28, 2024
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. vagrant built for me on x64 linux.

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/prs-ready-for-review/3032/5019

@wegank wegank added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Dec 29, 2024
@dattn dattn mentioned this pull request Jan 2, 2025
Closed
@devurandom
Copy link
Contributor

Closes: #370158 ?

@andersk
Copy link
Contributor Author

andersk commented Jan 4, 2025

@devurandom Yes, added.

@andersk
ruby-grpc: Only apply the GCC 14 patch if it’s not upstream
6be56a4 
It was upstreamed in v1.65.0-pre1~90; attempting to apply it again
after that causes errors.

Signed-off-by: Anders Kaseorg <[email protected]>
@paparodeo
Copy link
Contributor

paparodeo commented Jan 15, 2025 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368732

x86_64-linux

✅ 1 package built:
  • vagrant

darwin seems like it's been broken for a while:
https://hydra.nixos.org/job/nixpkgs/trunk/vagrant.aarch64-darwin

current breakage is due to to a vendored zlib which fails to compile with clang-19.

paparodeo
paparodeo approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@paparodeo paparodeo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looking forward to this getting merged

GaetanLepage
GaetanLepage approved these changes Jan 15, 2025
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM !

@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 368732

x86_64-linux

✅ 1 package built:
  • vagrant

aarch64-linux

✅ 1 package built:
  • vagrant

x86_64-darwin

❌ 1 package failed to build:
  • vagrant

aarch64-darwin

❌ 1 package failed to build:
  • vagrant

@GaetanLepage
Copy link
Contributor

Fails on darwin:

/nix/store/2y71rl5mnazwnpwpcq07xx97jl7sy5lh-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:208:7: error: expected identifier or '('
  208 | FILE    *fdopen(int, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(fdopen));
      |          ^

@paparodeo
Copy link
Contributor

Fails on darwin:

/nix/store/2y71rl5mnazwnpwpcq07xx97jl7sy5lh-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/stdio.h:208:7: error: expected identifier or '('
  208 | FILE    *fdopen(int, const char *) __DARWIN_ALIAS_STARTING(__MAC_10_6, __IPHONE_3_2, __DARWIN_EXTSN(fdopen));
      |          ^

this is due to a vendored zlib and has nothing to do with this change-- please see my comment #368732 (comment)

@GaetanLepage
Copy link
Contributor

this is due to a vendored zlib and has nothing to do with this change-- please see my comment #368732 (comment)

Oh right I missed it. Thanks

@GaetanLepage GaetanLepage merged commit b9ed245 into NixOS:master Jan 15, 2025
24 of 27 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@paparodeo paparodeo paparodeo approved these changes

@GaetanLepage GaetanLepage GaetanLepage approved these changes

Assignees
No one assigned
Labels
6.topic: ruby 10.rebuild-darwin: 1-10 10.rebuild-linux: 1-10 12.approvals: 1 This PR was reviewed and approved by one reputable person
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Unable to install vagrant. "failed to build"
6 participants
@andersk @nixos-discourse @devurandom @paparodeo @GaetanLepage @wegank